From: Fomafix <fomafix@googlemail.com>
Date: Sat, 16 Sep 2017 10:31:02 +0000 (+0200)
Subject: mediawiki.action.edit.preview: Apply mw.language.bcp47 to lang
X-Git-Tag: 1.31.0-rc.0~2077^2
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=8e9fb62c2badc468d20734f99bea12e1446bc127;p=lhc%2Fweb%2Fwiklou.git

mediawiki.action.edit.preview: Apply mw.language.bcp47 to lang

Apply mw.language.bcp47 to the language codes before using as values
for the HTML attributes lang and hreflang.

Change-Id: I4321d32f3b3a9729650060d59450701710b8c8f2
---

diff --git a/resources/Resources.php b/resources/Resources.php
index 10786dacaa..246d9f3222 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1451,6 +1451,7 @@ return [
 			'jquery.textSelection',
 			'mediawiki.api',
 			'mediawiki.diff.styles',
+			'mediawiki.language',
 			'mediawiki.util',
 			'mediawiki.jqueryMsg',
 			'oojs-ui-core',
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
index 7602dae4d8..ab1ce2770e 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
@@ -203,14 +203,15 @@
 				if ( response.parse.langlinks && mw.config.get( 'skin' ) === 'vector' ) {
 					newList = [];
 					$.each( response.parse.langlinks, function ( i, langlink ) {
+						var bcp47 = mw.language.bcp47( langlink.lang );
 						li = $( '<li>' )
 							.addClass( 'interlanguage-link interwiki-' + langlink.lang )
 							.append( $( '<a>' )
 								.attr( {
 									href: langlink.url,
 									title: langlink.title + ' - ' + langlink.langname,
-									lang: langlink.lang,
-									hreflang: langlink.lang
+									lang: bcp47,
+									hreflang: bcp47
 								} )
 								.text( langlink.autonym )
 							);